resolve: Remove `ScopeSet::Late` #145597

petrochenkov · 2025-08-19T09:24:41Z

It's better to decouple the late/early stage from scope set, because in #144131 (comment) we'll need the stage for ScopeSet::Module as well.

See individual commits for the refactoring details.
r? @b-naber

petrochenkov · 2025-08-19T09:25:30Z

compiler/rustc_resolve/src/diagnostics.rs

@@ -1020,11 +1020,11 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
        &mut self,
        suggestions: &mut Vec<TypoSuggestion>,
        scope_set: ScopeSet<'ra>,
-        parent_scope: &ParentScope<'ra>,
+        ps: &ParentScope<'ra>,


The formatting becomes awful if the visit_scopes call below becomes too long.

petrochenkov · 2025-08-19T09:27:39Z

compiler/rustc_resolve/src/ident.rs

-                            } else {
-                                Shadowing::Restricted
-                            },
+                            Shadowing::Restricted,


Replaced with a more fine-grained stage check in fn finalize_module_binding.

compiler/rustc_resolve/src/ident.rs

…scope_set`

It can be passed in a more usual way through `ParentScope`

The difference between `Late` and `All` only matters when `finalize` is enabled. So add a `stage` field to `Finalize` and use it instead.

rustbot · 2025-08-22T14:11:34Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

petrochenkov · 2025-08-22T14:12:32Z

Added the comment #145597 (comment) and rebased.

b-naber · 2025-08-22T19:05:23Z

@bors r+

bors · 2025-08-22T19:05:26Z

📌 Commit e26b175 has been approved by b-naber

It is now in the queue for this repository.

resolve: Remove `ScopeSet::Late` It's better to decouple the late/early stage from scope set, because in rust-lang#144131 (comment) we'll need the stage for `ScopeSet::Module` as well. See individual commits for the refactoring details. r? `@b-naber`

Rollup of 20 pull requests Successful merges: - #132087 (Fix overly restrictive lifetime in `core::panic::Location::file` return type) - #137396 (Recover `param: Ty = EXPR`) - #142185 (Convert moves of references to copies in ReferencePropagation) - #144443 (Make target pointer width in target json an integer) - #144648 (Implementation: `#[feature(nonpoison_rwlock)]`) - #144897 (print raw lifetime idents with r#) - #145218 ([Debuginfo] improve enum value formatting in LLDB for better readability) - #145380 (Add codegen-llvm regression tests) - #145573 (Add an experimental unsafe(force_target_feature) attribute.) - #145597 (resolve: Remove `ScopeSet::Late`) - #145641 (On E0277, point at type that doesn't implement bound) - #145669 (rustdoc-search: GUI tests check for `//` in URL) - #145695 (Introduce ProjectionElem::try_map.) - #145710 (Fix the ABI parameter inconsistency issue in debug.rs for LoongArch64) - #145726 (Experiment: Reborrow trait) - #145731 (Make raw pointers work in type-based search) - #145736 (triagebot: Update style team reviewers) - #145738 (Uplift rustc_mir_transform::coverage::counters::union_find to rustc_data_structures.) - #145743 (doc: fix some typos in comment) - #145745 (tests: Ignore basic-stepping.rs on LoongArch) Failed merges: - #145670 (port `sanitize` attribute to the new parsing infrastructure) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 28 pull requests Successful merges: - #132087 (Fix overly restrictive lifetime in `core::panic::Location::file` return type) - #137396 (Recover `param: Ty = EXPR`) - #137457 (Fix host code appearing in Wasm binaries) - #142185 (Convert moves of references to copies in ReferencePropagation) - #144648 (Implementation: `#[feature(nonpoison_rwlock)]`) - #144897 (print raw lifetime idents with r#) - #145218 ([Debuginfo] improve enum value formatting in LLDB for better readability) - #145380 (Add codegen-llvm regression tests) - #145573 (Add an experimental unsafe(force_target_feature) attribute.) - #145597 (resolve: Remove `ScopeSet::Late`) - #145633 (Fix some typos in LocalKey documentation) - #145641 (On E0277, point at type that doesn't implement bound) - #145669 (rustdoc-search: GUI tests check for `//` in URL) - #145695 (Introduce ProjectionElem::try_map.) - #145710 (Fix the ABI parameter inconsistency issue in debug.rs for LoongArch64) - #145726 (Experiment: Reborrow trait) - #145731 (Make raw pointers work in type-based search) - #145736 (triagebot: Update style team reviewers) - #145738 (Uplift rustc_mir_transform::coverage::counters::union_find to rustc_data_structures.) - #145742 (rustdoc js: Even more typechecking improvments ) - #145743 (doc: fix some typos in comment) - #145745 (tests: Ignore basic-stepping.rs on LoongArch) - #145747 (Refactor lint buffering to avoid requiring a giant enum) - #145751 (fix(lexer): Allow '-' in the frontmatter infostring continue set) - #145761 (Add aarch64_be-unknown-hermit target) - #145762 (convert strings to symbols in attr diagnostics) - #145763 (Ship LLVM tools for the correct target when cross-compiling) - #145765 (Revert suggestions for missing methods in tuples) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #145597 - petrochenkov:nolateset, r=b-naber resolve: Remove `ScopeSet::Late` It's better to decouple the late/early stage from scope set, because in #144131 (comment) we'll need the stage for `ScopeSet::Module` as well. See individual commits for the refactoring details. r? ``@b-naber``

Rollup of 28 pull requests Successful merges: - rust-lang/rust#132087 (Fix overly restrictive lifetime in `core::panic::Location::file` return type) - rust-lang/rust#137396 (Recover `param: Ty = EXPR`) - rust-lang/rust#137457 (Fix host code appearing in Wasm binaries) - rust-lang/rust#142185 (Convert moves of references to copies in ReferencePropagation) - rust-lang/rust#144648 (Implementation: `#[feature(nonpoison_rwlock)]`) - rust-lang/rust#144897 (print raw lifetime idents with r#) - rust-lang/rust#145218 ([Debuginfo] improve enum value formatting in LLDB for better readability) - rust-lang/rust#145380 (Add codegen-llvm regression tests) - rust-lang/rust#145573 (Add an experimental unsafe(force_target_feature) attribute.) - rust-lang/rust#145597 (resolve: Remove `ScopeSet::Late`) - rust-lang/rust#145633 (Fix some typos in LocalKey documentation) - rust-lang/rust#145641 (On E0277, point at type that doesn't implement bound) - rust-lang/rust#145669 (rustdoc-search: GUI tests check for `//` in URL) - rust-lang/rust#145695 (Introduce ProjectionElem::try_map.) - rust-lang/rust#145710 (Fix the ABI parameter inconsistency issue in debug.rs for LoongArch64) - rust-lang/rust#145726 (Experiment: Reborrow trait) - rust-lang/rust#145731 (Make raw pointers work in type-based search) - rust-lang/rust#145736 (triagebot: Update style team reviewers) - rust-lang/rust#145738 (Uplift rustc_mir_transform::coverage::counters::union_find to rustc_data_structures.) - rust-lang/rust#145742 (rustdoc js: Even more typechecking improvments ) - rust-lang/rust#145743 (doc: fix some typos in comment) - rust-lang/rust#145745 (tests: Ignore basic-stepping.rs on LoongArch) - rust-lang/rust#145747 (Refactor lint buffering to avoid requiring a giant enum) - rust-lang/rust#145751 (fix(lexer): Allow '-' in the frontmatter infostring continue set) - rust-lang/rust#145761 (Add aarch64_be-unknown-hermit target) - rust-lang/rust#145762 (convert strings to symbols in attr diagnostics) - rust-lang/rust#145763 (Ship LLVM tools for the correct target when cross-compiling) - rust-lang/rust#145765 (Revert suggestions for missing methods in tuples) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned b-naber Aug 19, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 19, 2025

petrochenkov commented Aug 19, 2025

View reviewed changes

This comment was marked as resolved.

Sign in to view

b-naber approved these changes Aug 21, 2025

View reviewed changes

compiler/rustc_resolve/src/ident.rs Show resolved Hide resolved

petrochenkov added 4 commits August 22, 2025 16:52

resolve: early_resolve_ident_in_lexical_scope -> `resolve_ident_in_…

774d96a

…scope_set`

resolve: Remove Module from ScopeSet::Late

b82b947

It can be passed in a more usual way through `ParentScope`

resolve: Remove derive fallback lint id from ScopeSet::Late

a47c372

resolve: Remove ScopeSet::Late

e26b175

The difference between `Late` and `All` only matters when `finalize` is enabled. So add a `stage` field to `Finalize` and use it instead.

petrochenkov force-pushed the nolateset branch from b37407e to e26b175 Compare August 22, 2025 14:11

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 22, 2025

jhpratt mentioned this pull request Aug 22, 2025

Rollup of 20 pull requests #145764

Closed

jhpratt mentioned this pull request Aug 23, 2025

Rollup of 28 pull requests #145773

Merged

bors merged commit 8066e76 into rust-lang:master Aug 23, 2025
10 checks passed

rustbot added this to the 1.91.0 milestone Aug 23, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

resolve: Remove `ScopeSet::Late` #145597

resolve: Remove `ScopeSet::Late` #145597

Uh oh!

petrochenkov commented Aug 19, 2025

Uh oh!

petrochenkov Aug 19, 2025

Uh oh!

petrochenkov Aug 19, 2025

Uh oh!

This comment was marked as resolved.

Uh oh!

rustbot commented Aug 22, 2025

Uh oh!

petrochenkov commented Aug 22, 2025

Uh oh!

b-naber commented Aug 22, 2025

Uh oh!

bors commented Aug 22, 2025

Uh oh!

Uh oh!

Uh oh!

resolve: Remove ScopeSet::Late #145597

resolve: Remove ScopeSet::Late #145597

Uh oh!

Conversation

petrochenkov commented Aug 19, 2025

Uh oh!

petrochenkov Aug 19, 2025

Choose a reason for hiding this comment

Uh oh!

petrochenkov Aug 19, 2025

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

Uh oh!

rustbot commented Aug 22, 2025

Uh oh!

petrochenkov commented Aug 22, 2025

Uh oh!

b-naber commented Aug 22, 2025

Uh oh!

bors commented Aug 22, 2025

Uh oh!

Uh oh!

Uh oh!

resolve: Remove `ScopeSet::Late` #145597

resolve: Remove `ScopeSet::Late` #145597